From c5dd968fda4150037fa091626e55c2ec68070df6 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 5 Jun 2024 13:30:31 +0200 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 552875 -> 553184 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 5ea4fd9f20b..62b85b27f23 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -359,6 +359,7 @@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index 666002340f8b021edbc1e4069b4b56096a852e0e..da5d1d4c2f0400d7a4acede75e01734333ece7a7 100644 GIT binary patch delta 208 zcmZ2|U-7|1#fBEf7N!>FEi9L}P7jo35}Cf?CY$i|%gb4Wl}n2=^U@VcGExOw!x`ZeKfwtd5P_TSq9ZDK~j delta 66 zcmaFxP;vEr#fBEf7N!>FEi9L}PJiUWAv1k~1PkwWvF$7ojMLXRaClCCV9d%neZd|U VuJ)%pSb&%nh}pJ3-NF8QI{=;S9R~ma diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 073f048998f..30c56dca268 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2